* Revert r94487 and r19889 to an extent -- ONLY check for the X-Forwarded-For header...